Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Mon, 17 Sep 2018 12:04:25 +0000 (08:04 -0400)
committerTom Rini <[email protected]>
Mon, 17 Sep 2018 12:04:25 +0000 (08:04 -0400)

Trivial merge